diff -rupN ../orig/artoolkitplus-2.1.0/src/librpp/rpp.cpp artoolkitplus-2.1.0/src/librpp/rpp.cpp
--- ../orig/artoolkitplus-2.1.0/src/librpp/rpp.cpp	2009-09-14 17:54:49.000000000 +0200
+++ artoolkitplus-2.1.0/src/librpp/rpp.cpp	2009-09-14 17:55:38.000000000 +0200
@@ -43,7 +43,7 @@
 
 #ifndef _NO_LIBRPP_
 
-
+#include <cstring>
 #include <vector>
 #include "assert.h"
 
diff -rupN ../orig/artoolkitplus-2.1.0/src/librpp/rpp_vecmat.cpp artoolkitplus-2.1.0/src/librpp/rpp_vecmat.cpp
--- ../orig/artoolkitplus-2.1.0/src/librpp/rpp_vecmat.cpp	2009-09-14 17:54:49.000000000 +0200
+++ artoolkitplus-2.1.0/src/librpp/rpp_vecmat.cpp	2009-09-14 17:55:38.000000000 +0200
@@ -40,10 +40,11 @@
 
 #ifndef _NO_LIBRPP_
 
-
+#include <cstdlib>
+#include <cstdio>
 #include "rpp_vecmat.h"
-#include "math.h"
-#include "assert.h"
+#include <cmath>
+#include <cassert>
 
 
 namespace rpp {
diff -rupN ../orig/artoolkitplus-2.1.0/tools/IdPatGen/src/PN/Image.cpp artoolkitplus-2.1.0/tools/IdPatGen/src/PN/Image.cpp
--- ../orig/artoolkitplus-2.1.0/tools/IdPatGen/src/PN/Image.cpp	2009-09-14 17:54:49.000000000 +0200
+++ artoolkitplus-2.1.0/tools/IdPatGen/src/PN/Image.cpp	2009-09-14 17:55:38.000000000 +0200
@@ -35,6 +35,7 @@
 
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <string>
 
 #if defined(TARGET_HOST_WIN32) || defined(TARGET_HOST_WINCE)
diff -rupN ../orig/artoolkitplus-2.1.0/tools/IdPatGen/src/PN/ImageTool.cpp artoolkitplus-2.1.0/tools/IdPatGen/src/PN/ImageTool.cpp
--- ../orig/artoolkitplus-2.1.0/tools/IdPatGen/src/PN/ImageTool.cpp	2009-09-14 17:54:49.000000000 +0200
+++ artoolkitplus-2.1.0/tools/IdPatGen/src/PN/ImageTool.cpp	2009-09-14 17:55:38.000000000 +0200
@@ -32,6 +32,7 @@
 #include "PocketKnife.h"
 #include "ImageTool.h"
 
+#include <cstring>
 #include <cstdio>
 #include <string>
 
